refactor[STM32][DMA]: unify DMA helpers and descriptors for HAL drivers#11346
Open
wdfk-prog wants to merge 2 commits intoRT-Thread:masterfrom
Open
refactor[STM32][DMA]: unify DMA helpers and descriptors for HAL drivers#11346wdfk-prog wants to merge 2 commits intoRT-Thread:masterfrom
wdfk-prog wants to merge 2 commits intoRT-Thread:masterfrom
Conversation
|
👋 感谢您对 RT-Thread 的贡献！Thank you for your contribution to RT-Thread! 为确保代码符合 RT-Thread 的编码规范，请在你的仓库中执行以下步骤运行代码格式化工作流（如果格式化CI运行失败）。 🛠 操作步骤 | Steps
完成后，提交将自动更新至 如有问题欢迎联系我们，再次感谢您的贡献！💐 |
Contributor
Author
|
📌 Code Review Assignment🏷️ Tag: bsp_stm32Reviewers: @Liang1795 @hamburger-os @wdfk-prog Changed Files (Click to expand)
📊 Current Review Status (Last Updated: 2026-05-05 09:07 CST)
📝 Review Instructions
|
wdfk-prog
force-pushed
the
pr/04-stm32-dma
branch
2 times, most recently
from
eeb73be to
d125ab3
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors the STM32 HAL_Drivers DMA integration by introducing a shared DMA helper layer and migrating multiple peripheral drivers + per-series config headers to a unified stm32_dma_config descriptor style, reducing duplicated DMA init/NVIC/rollback logic across UART/SPI/I2C/SDIO/QSPI.
本次 PR 通过新增通用 DMA helper 层，并将多个外设驱动及各系列配置头文件迁移到统一的 stm32_dma_config 描述符风格，来减少 UART/SPI/I2C/SDIO/QSPI 等驱动中 DMA 初始化/NVIC/回滚逻辑的重复实现。
Changes:
- Add common DMA helper module (
drv_dma.c/.h) and wire it into the HAL_Drivers build. - Switch multiple driver config structs from legacy
dma_configtostm32_dma_config(mostlyconst *) and route DMA init via shared helpers. - Update per-series config headers to use unified
STM32_DMA_*_CONFIG_INIT_EX-style macros with overridable priority fields.
变更点：
- 新增通用 DMA helper 模块（
drv_dma.c/.h），并加入 HAL_Drivers 构建。 - 多个驱动配置结构从旧
dma_config切换到stm32_dma_config（多为const *），DMA 初始化流程复用公共 helper。 - 各系列配置头迁移到统一的
STM32_DMA_*_CONFIG_INIT_EX宏，并补充可覆写的优先级字段。
Reviewed changes
Copilot reviewed 75 out of 75 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| bsp/stm32/libraries/HAL_Drivers/drivers/SConscript | Always builds the new common DMA helper module |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_dma.c | New common DMA init/setup/deinit implementation (HAL-gated) |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_dma.h | New unified DMA descriptor type + init macros + helper APIs |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_config.h | Exposes DMA helper types to driver config headers |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_usart.h | UART config now references stm32_dma_config pointers |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_usart_v2.h | USART v2 config now references stm32_dma_config pointers |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_spi.h | SPI config now references stm32_dma_config pointers |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_hard_i2c.h | I2C config now references stm32_dma_config pointers |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdio.h | SDIO embeds stm32_dma_config descriptors (rx/tx) |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdio.c | SDIO DMA path moved to shared DMA helpers with rollback |
| bsp/stm32/libraries/HAL_Drivers/drivers/drv_qspi.c | QSPI DMA init moved to stm32_dma_setup |
| bsp/stm32/libraries/HAL_Drivers/drivers/config/wl/uart_config.h | WL UART DMA config migrated to unified init macros + overridable priorities |
| bsp/stm32/libraries/HAL_Drivers/drivers/config/l5/spi_config.h | L5 SPI DMA config migrated to unified init macros + overridable priorities |
| bsp/stm32/libraries/HAL_Drivers/drivers/config/h7/dma_config.h | Adds QSPI request fallback selection for H7 |
| bsp/stm32/libraries/HAL_Drivers/drivers/config/mp1/dma_config.h | Adds QSPI request fallback selection for MP1 |
- add drv_dma common helpers and stm32_dma_config descriptors for STM32 series - refactor i2c, spi, usart, qspi, and sdio DMA setup and deinit paths to reuse the common layer - unify DMA IRQ enable, rollback handling, and const board-level DMA configuration usage
- migrate STM32 HAL driver DMA config macros to shared descriptor init helpers - add overridable DMA priority and NVIC priority fields for board-level configs - align SPI, UART, I2C, SDIO, and QSPI DMA descriptors across visible STM32 series configs - simplify per-series DMA config definitions and reduce duplicated field assignments
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
拉取/合并请求描述：(PR description)
[
为什么提交这份PR (why to submit this PR)
当前 STM32 HAL_Drivers 中 DMA 相关实现分散在两层：
这种实现方式导致 DMA 接入路径和配置表达方式不统一，增加了维护成本，也不利于后续扩展更多 STM32 系列或外设 DMA 场景。
你的解决方案是什么 (what is your solution)
本次修改统一了驱动侧和配置侧两部分 DMA 逻辑：
在驱动侧新增
drv_dma.c/drv_dma.h，引入stm32_dma_config描述结构以及stm32_dma_init()、stm32_dma_setup()、stm32_dma_deinit()等公共 helper，用于统一处理 DMA 控制器时钟开启、DMAMUX 使能、HAL DMA 参数下发、NVIC 配置和反初始化流程。将
drv_hard_i2c.c、drv_spi.c、drv_usart.c、drv_usart_v2.c、drv_qspi.c、drv_sdio.c中原有分散的 DMA 初始化和回滚逻辑切换为复用公共 helper，并将驱动内部相关 DMA 配置改为const struct stm32_dma_config。在配置侧，将多个 STM32 系列下
SPI/UART/I2C/SDIO/QSPI的 DMA 配置宏迁移为统一的描述符初始化宏，如STM32_DMA_*_CONFIG_INIT_EX和STM32_DMA_CONFIG_INIT_FIFO_EX，并补充可覆写的DMA_PRIORITY、DMA_PREEMPT_PRIORITY、DMA_SUB_PRIORITY字段，以统一不同系列配置头的表达方式。请提供验证的bsp和config (provide the config and bsp)
BSP:
.config:
BSP_SPIx_TX_USING_DMA、BSP_SPIx_RX_USING_DMA、BSP_UARTx_TX_USING_DMA、BSP_UARTx_RX_USING_DMA、BSP_I2Cx_TX_USING_DMA、BSP_I2Cx_RX_USING_DMA、BSP_QSPI_USING_DMA、BSP_USING_SDIOaction:
]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality：
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up